Version emacs icons and use update-alternatives where appropriate.

diff --git a/debian/changelog b/debian/changelog
index 8f009fdcc942a2be033c5699c88ec3e1e2b97e37..804e9c22c0be760fc17a0b4d5f238aa65ca74411 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,7 +12,15 @@ emacs23 (23.1+1-3) unstable; urgency=low
   * Don't build-depend on libgmp-dev on hurd or kfreebsd.  Thanks to
     Cyril Brulebois <kibi@debian.org>. (closes: #541353)
 
- -- Rob Browning <rlb@defaultvalue.org>  Tue, 01 Sep 2009 20:04:40 -0700
+  * Fix emacsVER.desktop to refer to SVG file instead of incorrect
+    PNG, remove emacs22.png files from unversioned /usr/share/icons
+    directory, and change emacs*.png and emacs*.svg files to
+    emacsVER*.png and emacsVER*.svg.  Also use update-alternatives to
+    manage the unversioned names for these files.  Thanks to Atsuhito
+    KOHDA <kohda@pm.tokushima-u.ac.jp> for the initial
+    report. (closes: #539851)
+
+ -- Rob Browning <rlb@defaultvalue.org>  Tue, 01 Sep 2009 21:14:54 -0700
 
 emacs23 (23.1+1-2) unstable; urgency=low
 

diff --git a/debian/emacsVER.desktop b/debian/emacsVER.desktop
index f37f10bf03443080fcc27592a372d01de25240a9..3b43bfb84541515c371a5dc2cc85723712eb87a5 100644 (file)
--- a/debian/emacsVER.desktop
+++ b/debian/emacsVER.desktop
@@ -8,6 +8,6 @@ Exec=/usr/bin/@DEB_FLAVOR@
 TryExec=@DEB_FLAVOR@
 Terminal=false
 Type=Application
-Icon=/usr/share/emacs/@FULL_VERSION@/etc/images/icons/emacs_48.png
+Icon=/usr/share/icons/hicolor/scalable/apps/@DEB_FLAVOR@.svg
 Categories=Application;Utility;TextEditor;
 MimeType=text/plain

diff --git a/debian/emacsVER.postinst b/debian/emacsVER.postinst
index 5445b5b57f5d09b98add564de3a0dc9d2ceb647f..fa39d57d99e28f9f7903fb3219b79aa708218c18 100644 (file)
--- a/debian/emacsVER.postinst
+++ b/debian/emacsVER.postinst
@@ -8,7 +8,22 @@ update-alternatives \
   --install /usr/bin/emacs emacs \
             /usr/bin/${FLAVOR}-@X_SUPPORT@ @BIN_PRIORITY@ \
   --slave /usr/share/man/man1/emacs.1.gz emacs.1.gz \
-          /usr/share/man/man1/emacs.${FLAVOR}.1.gz
+          /usr/share/man/man1/emacs.${FLAVOR}.1.gz \
+  --slave /usr/share/icons/hicolor/scalable/apps/emacs.svg emacs.svg \
+          /usr/share/icons/hicolor/scalable/apps/${FLAVOR}.svg \
+  --slave /usr/share/icons/hicolor/scalable/mimetypes/emacs-document.svg \
+          emacs-document.svg \
+          /usr/share/icons/hicolor/scalable/apps/${FLAVOR}-document.svg \
+  --slave /usr/share/icons/hicolor/16x16/apps/emacs.png emacs-16x16.png \
+          /usr/share/icons/hicolor/16x16/apps/${FLAVOR}.png \
+  --slave /usr/share/icons/hicolor/24x24/apps/emacs.png  emacs-24x24.png \
+          /usr/share/icons/hicolor/24x24/apps/${FLAVOR}.png \
+  --slave /usr/share/icons/hicolor/32x32/apps/emacs.png emacs-32x32.png \
+          /usr/share/icons/hicolor/32x32/apps/${FLAVOR}.png \
+  --slave /usr/share/icons/hicolor/48x48/apps/emacs.png emacs-48x48.png \
+          /usr/share/icons/hicolor/48x48/apps/${FLAVOR}.png \
+  --slave /usr/share/icons/hicolor/128x128/apps/emacs.png emacs-128x128.png \
+          /usr/share/icons/hicolor/128x128/apps/${FLAVOR}.png
 
 update-alternatives \
   --install /usr/bin/editor editor \

diff --git a/debian/rules b/debian/rules
index d19618f3f9a37ecf7222c101075b031f950080ed..aac637a861c3e4e7a132a1871cc805ee2708dbe0 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -716,10 +716,28 @@ install: debian/stamp/build $(autogen_install_files)
 
        cd $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc/images/icons \
          && convert hicolor/16x16/apps/emacs.{png,xpm}
-
        cd $(pkgdir_common)/usr/share/emacs/$(runtime_ver)/etc/images/icons \
          && convert hicolor/32x32/apps/emacs.{png,xpm}
 
+        # Fixup image files in unversioned directories (remove old
+        # images, version unversioned images) and prepare for
+        # update-alternatives.
+       rm $(pkgdir_common)/usr/share/icons/hicolor/16x16/apps/emacs22.png
+       rm $(pkgdir_common)/usr/share/icons/hicolor/24x24/apps/emacs22.png
+       rm $(pkgdir_common)/usr/share/icons/hicolor/48x48/apps/emacs22.png
+
+       cd $(pkgdir_common)/usr/share/icons/hicolor \
+         && mv scalable/apps/emacs.svg scalable/apps/${flavor}.svg \
+         && mv 16x16/apps/emacs.png 16x16/apps/${flavor}.png \
+         && mv 24x24/apps/emacs.png 24x24/apps/${flavor}.png \
+         && mv 32x32/apps/emacs.png 32x32/apps/${flavor}.png \
+         && mv 48x48/apps/emacs.png 48x48/apps/${flavor}.png \
+         && mv 128x128/apps/emacs.png 128x128/apps/${flavor}.png
+
+       cd $(pkgdir_common)/usr/share/icons/hicolor/scalable/mimetypes \
+         && mv emacs-document.svg ${flavor}-document.svg
+
+
         # Mangle info files.
        chmod 755 debian/mangle-info
        for f in $(main_dir_info_files); \